]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
dateMenu: Adjust to GWeather IAPI change
authorFlorian Müllner <fmuellner@gnome.org>
Fri, 8 Sep 2017 10:13:48 +0000 (12:13 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Tue, 12 Sep 2017 15:32:51 +0000 (17:32 +0200)
It's not exactly clear what changed - gobject-introspection, gjs - but
the newly added gweather_condition_to_string_full() API no longer works
like it used to. The replacement code does look more idiomatic anyway,
so just fix the code without investigating the reason of the breakage.

https://bugzilla.gnome.org/show_bug.cgi?id=787423

js/ui/dateMenu.js

index 18f2f0e6b6a34f69c2bfb1de73c2c2a2178b48c6..0054f2d02f67c2e2c24f1c8a6a98b16963dae441 100644 (file)
@@ -237,12 +237,12 @@ var WeatherSection = new Lang.Class({
         let options = capitalize ? GWeather.FormatOptions.SENTENCE_CAPITALIZATION
                                  : GWeather.FormatOptions.NO_CAPITALIZATION;
 
-        let [ok, phenom, qualifier] = info.get_value_conditions();
+        let [ok, phenomenon, qualifier] = info.get_value_conditions();
         if (ok)
-            return GWeather.conditions_to_string_full(phenom, qualifier, options);
+            return new GWeather.Conditions({ phenomenon, qualifier}).to_string_full(options);
 
         let [, sky] = info.get_value_sky();
-        return GWeather.sky_to_string_full(sky, options);
+        return GWeather.Sky.to_string_full(sky, options);
     },
 
     _sameSummary: function(info1, info2) {